From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 31 May 2011 05:15:34 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3601^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5de85475989bd676e2c3dd0c36ad5822e7cc497d;p=emacs.git

Merge from trunk.
---

5de85475989bd676e2c3dd0c36ad5822e7cc497d
diff --cc src/ChangeLog
index 2c3a0f8559a,95dadf642cf..40ac63840c9
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,13 -1,26 +1,37 @@@
- 2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
++2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Use 'inline', not 'INLINE'.
++	<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00914.html>
 +	* alloc.c, fontset.c (INLINE): Remove.
 +	* alloc.c, bidi.c, charset.c, coding.c, dispnew.c, fns.c, image.c:
 +	* intervals.c, keyboard.c, process.c, syntax.c, textprop.c, w32term.c:
 +	* xdisp.c, xfaces.c, xterm.c: Replace all uses of INLINE with inline.
 +	* gmalloc.c (register_heapinfo): Use inline unconditionally.
 +	* lisp.h (LISP_MAKE_RVALUE): Use inline, not __inline__.
 +
+ 2011-05-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* minibuf.c (Finternal_complete_buffer): Return `category' metadata.
+ 	(read_minibuf): Use get_minibuffer.
+ 	(syms_of_minibuf): Use DEFSYM.
+ 	(Qmetadata): New var.
+ 	* data.c (Qbuffer): Don't make it static.
+ 	(syms_of_data): Use DEFSYM.
+ 
+ 2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	* ccl.c (CCL_CODE_RANGE): Allow negative numbers.  (Bug#8751)
+ 	(CCL_CODE_MIN): New macro.
+ 
+ 2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	* alloc.c (lisp_align_malloc): Omit unnecessary val==NULL tests.
+ 
+ 	* eval.c (Qdebug): Now static.
+ 	* lisp.h (Qdebug): Remove decl.  This reverts a part of the
+ 	2011-04-26 change (bzr 104015) that inadvertently undid part of
+ 	the 2011-04-14 change (bzr 103913).
+ 
  2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
  
  	* image.c: Various fixes to ImageMagick code comments.